From 0dc58fb24db662cf6363c4705f00ecc945d39ed9 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 19 Apr 2004 16:17:01 +0000 Subject: [PATCH] Don't stop the iteration up to the tag_root too early. (#109945, Dongho 2004-04-19 Matthias Clasen * gtk/gtktextbtree.c (_gtk_text_line_previous_could_contain_tag): Don't stop the iteration up to the tag_root too early. (#109945, Dongho Shin) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtktextbtree.c | 6 ++---- 6 files changed, 32 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index dbd574a564..e79f1c674f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-04-19 Matthias Clasen + + * gtk/gtktextbtree.c (_gtk_text_line_previous_could_contain_tag): + Don't stop the iteration up to the tag_root too + early. (#109945, Dongho Shin) + Sun Apr 18 17:06:03 2004 Soeren Sandmann * gdk/x11/gdkkeys-x11.c (get_effective_keymap): Make diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index dbd574a564..e79f1c674f 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2004-04-19 Matthias Clasen + + * gtk/gtktextbtree.c (_gtk_text_line_previous_could_contain_tag): + Don't stop the iteration up to the tag_root too + early. (#109945, Dongho Shin) + Sun Apr 18 17:06:03 2004 Soeren Sandmann * gdk/x11/gdkkeys-x11.c (get_effective_keymap): Make diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index dbd574a564..e79f1c674f 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +2004-04-19 Matthias Clasen + + * gtk/gtktextbtree.c (_gtk_text_line_previous_could_contain_tag): + Don't stop the iteration up to the tag_root too + early. (#109945, Dongho Shin) + Sun Apr 18 17:06:03 2004 Soeren Sandmann * gdk/x11/gdkkeys-x11.c (get_effective_keymap): Make diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index dbd574a564..e79f1c674f 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2004-04-19 Matthias Clasen + + * gtk/gtktextbtree.c (_gtk_text_line_previous_could_contain_tag): + Don't stop the iteration up to the tag_root too + early. (#109945, Dongho Shin) + Sun Apr 18 17:06:03 2004 Soeren Sandmann * gdk/x11/gdkkeys-x11.c (get_effective_keymap): Make diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index dbd574a564..e79f1c674f 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2004-04-19 Matthias Clasen + + * gtk/gtktextbtree.c (_gtk_text_line_previous_could_contain_tag): + Don't stop the iteration up to the tag_root too + early. (#109945, Dongho Shin) + Sun Apr 18 17:06:03 2004 Soeren Sandmann * gdk/x11/gdkkeys-x11.c (get_effective_keymap): Make diff --git a/gtk/gtktextbtree.c b/gtk/gtktextbtree.c index b956fb4992..663207e641 100644 --- a/gtk/gtktextbtree.c +++ b/gtk/gtktextbtree.c @@ -4488,8 +4488,7 @@ _gtk_text_line_previous_could_contain_tag (GtkTextLine *line, line_ancestor_parent = line->parent->parent; node = line_ancestor_parent->children.node; - while (node != line_ancestor && - line_ancestor != info->tag_root) + while (node != line_ancestor || line_ancestor != info->tag_root) { GSList *child_nodes = NULL; GSList *tmp; @@ -4497,8 +4496,7 @@ _gtk_text_line_previous_could_contain_tag (GtkTextLine *line, /* Create reverse-order list of nodes before * line_ancestor */ - while (node != line_ancestor - && node != NULL) + while (node != line_ancestor && node != NULL) { child_nodes = g_slist_prepend (child_nodes, node); -- 2.30.2